fix(worktrees): read the worktree id from .name as well as .worktree_id - #85
Open
thecodedrift wants to merge 2 commits into
Open
fix(worktrees): read the worktree id from .name as well as .worktree_id#85thecodedrift wants to merge 2 commits into
thecodedrift wants to merge 2 commits into
Conversation
thecodedrift
added
the
skip-changeset
thecodedrift
marked this pull request as ready for review
August 6, 2026 17:24
Member
Author
|
@claude /review |
|
Claude finished @thecodedrift's task in 3m 55s —— View job Review: fix(worktrees): read the worktree id from
|
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes WorktreeCreate hook robustness by accepting multiple possible worktree identifier fields from stdin, preventing worktree-isolated background-agent delegation from failing when .worktree_id is absent.
Changes:
- Read the worktree identifier from
.worktree_id,.worktreeId, or.name. - Improve the failure message when no identifier is present.
- Expand the hook contract comment to document identifier-field drift across callers.
![claude[bot]](https://avatars.githubusercontent.com/in/1236702?s=60&v=4){kind=small}
thecodedrift
force-pushed
the
fix/worktree-hook-payload
branch
from
August 6, 2026 23:59
ddd74f1 to
93caf41
Compare
Member
Author
All three inline notes are addressed in — AI Coding Agent |
Delegating to a background agent with worktree isolation failed outright: "WorktreeCreate: no .worktree_id on stdin". The hook replaces the default creation logic, so a non-zero exit means no worktree and no agent. The payload for that path carries `.name` (e.g. "agent-a5e1de46e730bdfd7") and no `.worktree_id` at all — captured from a real invocation rather than inferred. The hook now reads `.worktree_id`, `.worktreeId`, or `.name`, and its contract comment records that the field is not stable across callers, since the failure message otherwise reads as though the harness sent nothing. Verified by re-running the delegation: the worktree was created and the agent completed its work in it.
The contract comment said "both are read" while the implementation accepts three (.worktree_id, .worktreeId, .name). Name all three, and write down that .name rests on one captured payload rather than a guaranteed contract — an unrelated .name lands on the regex guard below and fails loudly, which is the intended floor. Restore .base_path to the documented-but-unused field list (dropped in the rewrite, not deliberately), and show a .name payload in the SKILL.md verify probe so the fallback is discoverable without reading the script. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Jwc9FFroR3mTZ4hLiSkkX3
thecodedrift
force-pushed
the
fix/worktree-hook-payload
branch
from
August 7, 2026 06:06
93caf41 to
1cb9dc5
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Delegating to a background agent with worktree isolation failed outright with
WorktreeCreate: no .worktree_id on stdin. Because this hook replaces Claude Code's default creation logic, a non-zero exit means no worktree is created and the agent never starts — so worktree-isolated delegation was simply unavailable.The payload for that path carries
.name(e.g.agent-a5e1de46e730bdfd7) and no.worktree_idat all. That was captured from a real invocation rather than inferred: the hook was temporarily made to dump stdin on failure, the delegation was re-run, and the saved JSON had keyscwd,hook_event_name,name,prompt_id,session_id,transcript_path.The hook now reads
.worktree_id,.worktreeId, or.name, and its contract comment records that the id field is not stable across callers — worth stating, because the previous failure message read as though the harness had sent nothing at all, which sends you looking in the wrong place.Verified by re-running the delegation against the fixed hook: the worktree was created at
worktrees/agent-af8378fb661401c98and the agent completed its work inside it.One related thing left alone deliberately:
worktree-remove.shreads.worktree_path, which may be subject to the same drift. It fails open — a missing field just leaves the worktree in place — so the symptom is a stale directory rather than lost work, and I did not want to guess at a fallback that could resolve to something removable. Worth confirming separately against a real remove payload.